fix(settings): confirm app-token revoke and preserve wipe state#60644
Merged
Conversation
pringelmann
added
enhancement
3. to review
pringelmann
requested review from
come-nc,
nfebe,
provokateurin,
sorbaugh and
susnux
and removed request for
a team
CarlSchwan
approved these changes
May 22, 2026
susnux
approved these changes
May 22, 2026
susnux
reviewed
May 22, 2026
susnux
reviewed
May 22, 2026
susnux
reviewed
May 22, 2026
susnux
reviewed
May 22, 2026
susnux
reviewed
May 22, 2026
Contributor
susnux
left a comment
susnux
left a comment
There was a problem hiding this comment.
functionality wise approved, some code comments
pringelmann
force-pushed
the
fix/app-token-delete-confirm
branch
from
ec56a07 to
01f5ecc
Compare
Contributor
Author
|
/backport to stable34 |
Contributor
Author
|
/backport to stable33 |
Contributor
Author
|
/backport to stable32 |
Adds an NcDialog confirmation to the Revoke action; deletion was previously instant on click. When the token is marked for remote wipe, the dialog surfaces a warning and the destructive button switches to "Cancel wipe and revoke" so cancelling an in-flight wipe is an explicit opt-in. Also migrates the existing Wipe confirm from the legacy window.OC.dialogs.confirm helper to NcDialog, matching the new delete dialog. The auth token store actions are now pure API callers; the UI does the gating. Signed-off-by: Peter Ringelmann <peter.ringelmann@nextcloud.com>
Signed-off-by: Peter Ringelmann <peter.ringelmann@nextcloud.com>
Signed-off-by: Peter Ringelmann <peter.ringelmann@nextcloud.com>
Signed-off-by: Peter Ringelmann <peter.ringelmann@nextcloud.com>
Signed-off-by: Peter Ringelmann <peter.ringelmann@nextcloud.com>
Signed-off-by: Peter Ringelmann <peter.ringelmann@nextcloud.com>
Signed-off-by: Peter Ringelmann <peter.ringelmann@nextcloud.com>
pringelmann
force-pushed
the
fix/app-token-delete-confirm
branch
from
0acb5ed to
407d4fe
Compare
|
The backport to # Switch to the target branch and update it
git checkout stable32
git pull origin stable32
# Create the new backport branch
git checkout -b backport/60644/stable32
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 05a188e3 16ca990b 4b1c3fbe eaf565f2 1d035b4c bbdb7d01 407d4fee
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/60644/stable32Error: Failed to check for changes with origin/stable32: No changes found in backport branch Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
|
The backport to # Switch to the target branch and update it
git checkout stable33
git pull origin stable33
# Create the new backport branch
git checkout -b backport/60644/stable33
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 05a188e3 16ca990b 4b1c3fbe eaf565f2 1d035b4c bbdb7d01 407d4fee
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/60644/stable33Error: Failed to check for changes with origin/stable33: No changes found in backport branch Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
3 tasks
This was referenced May 27, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Revoking an app password now opens an
NcDialogconfirmation. For tokens marked for remote wipe the dialog uses a red error card and the destructive button reads "Revoke and cancel wipe", so cancelling an in-flight wipe is a deliberate click rather than a side effect of clicking the trash icon.Two admin-only deletion paths used to drop the wipe marker the same way the user-facing controller did. Both are guarded now:
occ user:auth-tokens:deleterefuses wipe-pending tokens unless--cancel-wipeis passed, and OAuth2 client revocation skips matching wipe-pending tokens (with a log line) so the wipe outlives the client.Backports needed for
stable34,stable33,stable32.Screenshot
Checklist
3. to review, feature component)stable32)